Refactor: Remove Merge Conflicts#136
Merged
rajat-k1 merged 27 commits intorelease/v2.0from Apr 23, 2025
Merged
Conversation
…s, and feature requests
Enhancement: Add GitHub Issue Templates for Bug, Feature, and Enhancement
…lates Revert "Enhancement: Add GitHub Issue Templates for Bug, Feature, and Enhancement"
hotfix: Updated map and added a school to list 🛠️
hotfix: Release/bug fixes
Turning gamezone sections into buttons and removed extra alt text to help with screen reader navigation.
Set up Prettier
Added the variable declaration for debugMessage, which was missing in earlier commits!
feature: update team section with missing members
…ing displayed correctly issue
Approving the PR It works as discussed with Prajwala. And the error messages are working as desired
Major Release - bug fixes and login system
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
There was a problem hiding this comment.
Pull Request Overview
This PR removes merge conflict artifacts and refactors error handling logic across various pages to improve user feedback. Key changes include:
- Updated error handling in SignUp.js, ResetPassword.vue, and ForgotPassword.vue with switch-case logic for various HTTP statuses.
- UI updates in Impact and GameZone pages, including marker data adjustments and improved text cleaning.
- Addition of new staff members and updated GitHub issue templates to support feature, enhancement, and bug reporting.
Reviewed Changes
Copilot reviewed 21 out of 22 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/pages/SignUp/SignUp.js | Refactored error handling with switch-case statements and added a helper function for alerts. |
| src/pages/ResetPassword/ResetPassword.vue | Improved API error processing and added form validations with pre-condition checks. |
| src/pages/Impact/CollaboratingSchools/Map.vue | Updated marker coordinates and popup text. |
| src/pages/Impact/CollaboratingSchools/Affiliates.vue | Updated affiliate data with new organization details. |
| src/pages/GameZone/GameZoneList/ColorGame.vue | Enhanced text cleaning logic for user input. |
| src/pages/GameZone/GameZoneList/CarCounting.vue | Introduced improved punctuation removal before answer checking. |
| src/pages/GameZone/GameZoneCard/GameZoneCard.vue | Changed container element from a div to a button for improved interactivity. |
| src/pages/ForgotPassword/ForgotPassword.vue | Updated error handling logic and responses. |
| src/pages/AboutUs/Volunteers/Staff.js | Added new developer entries in the staff list. |
| .github/ISSUE_TEMPLATE/* | Added and updated issue templates for feature requests, enhancements, and bug reports. |
Files not reviewed (1)
- .prettierrc: Language not supported
Comments suppressed due to low confidence (1)
src/pages/SignUp/SignUp.js:29
- The variable 'message' is not defined within this scope; consider extracting the error message from the response or remove the reference to 'message'.
showErrorAlert("Bad request: " + (message || "Please check your input"));
| if ((password.value != confirmPassword.value) || (password.value.length < 8)) { | ||
| // Set the flag to true to display the error message on the frontend | ||
| errors.value = true; | ||
| errorMessage.value = "Passwords do not match or is not at least 8 characters long"; |
There was a problem hiding this comment.
[nitpick] Consider revising the error text for grammatical clarity (e.g., 'Passwords do not match or are less than 8 characters long').
Suggested change
| errorMessage.value = "Passwords do not match or is not at least 8 characters long"; | |
| errorMessage.value = "Passwords do not match or are less than 8 characters long"; |
Collaborator
Author
|
@rajat-k1 Approve this to be inline with main branch |
rajat-k1
approved these changes
Apr 23, 2025
Collaborator
rajat-k1
left a comment
rajat-k1
left a comment
There was a problem hiding this comment.
The changes from main to release are necessary for future development, as release/v2.0 is essentially the dev branch.
The changes look good, Approved ✅
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Remove Merge Conflicts for future dev